[IA64] Include automated sparse merge script
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 16 May 2006 18:54:26 +0000 (12:54 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 16 May 2006 18:54:26 +0000 (12:54 -0600)
commit345aa4ded5fc718dee30d1ac8f397704f9f88996
tree1702108654c9ae1c7383f3594fd6043563e6ae89
parentc8c9447a8fe0d46c09c4226baba5179bda8cff70
[IA64] Include automated sparse merge script

This script automates merging the sparse tree to new upstream
kernel revisions.  When possible the files are automatically
patched to the new version, if that fails, the xen and upstream
patches are tried in reverse order, if that fails, the method
producing the smallest reject is left for manual merging.

Run as:

# LINUXPATH=$HOME/linux-2.6 sparse-merge

Where LINUXPATH is a local mercurial tree of the upstream kernel
(available from http://www.kernel.org/hg/linux-2.6).  NEWTAG and
OLDTAG may also be specified if the autodetection does not work.
By default, NEWTAG will be the latest upstream version.  If NEWTAG
or OLDTAG is an extra-version (ex. 2.6.16.13), ketchup will be
used to update the mercurial tree and add the appropriate tag.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
Signed-off-by: Aron Griffis <aron@hp.com>
xen/arch/ia64/tools/sparse-merge [new file with mode: 0755]